From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Mon, 10 Sep 2007 15:51:20 +0000 (+0100)
Subject: Change prototype of machine_restart to void machine_restart(void).
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14984^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=354aabe18a23a04e0d49fae9771dc6169399008b;p=xen.git

Change prototype of machine_restart to void machine_restart(void).
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index e9d1d3103b..9f30f4355f 100644
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -1486,7 +1486,7 @@ int __init construct_dom0(struct domain *d,
 	return 0;
 }
 
-void machine_restart(char * __unused)
+void machine_restart(void)
 {
 	console_start_sync();
 	if (running_on_sim)
diff --git a/xen/arch/powerpc/domain.c b/xen/arch/powerpc/domain.c
index c0f78bf797..214a257385 100644
--- a/xen/arch/powerpc/domain.c
+++ b/xen/arch/powerpc/domain.c
@@ -119,7 +119,7 @@ void machine_halt(void)
     machine_fail(__func__);
 }
 
-void machine_restart(char * __unused)
+void machine_restart(void)
 {
     console_start_sync();
     printk("%s called\n", __func__);
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 5fbecc088e..8bc658fa83 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -197,7 +197,7 @@ static void machine_real_restart(const unsigned char *code, unsigned length)
 
 #endif
 
-void machine_restart(char *cmd)
+void machine_restart(void)
 {
     int i;
 
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index e6e4d296ab..f7756cd324 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -123,7 +123,7 @@ static void dump_registers(unsigned char key, struct cpu_user_regs *regs)
 static void halt_machine(unsigned char key, struct cpu_user_regs *regs)
 {
     printk("'%c' pressed -> rebooting machine\n", key);
-    machine_restart(NULL);
+    machine_restart();
 }
 
 static void cpuset_print(char *set, int size, cpumask_t mask)
diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index a994e14bfc..a3d48bf899 100644
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -24,7 +24,7 @@ static void maybe_reboot(void)
         printk("rebooting machine in 5 seconds.\n");
         watchdog_disable();
         mdelay(5000);
-        machine_restart(NULL);
+        machine_restart();
     }
 }
 
@@ -50,7 +50,7 @@ void dom0_shutdown(u8 reason)
     case SHUTDOWN_reboot:
     {
         printk("Domain 0 shutdown: rebooting machine.\n");
-        machine_restart(NULL);
+        machine_restart();
         break; /* not reached */
     }
 
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 1d88fc8078..7d52a4c3ca 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -895,7 +895,7 @@ void panic(const char *fmt, ...)
     {
         watchdog_disable();
         mdelay(5000);
-        machine_restart(NULL);
+        machine_restart();
     }
 }
 
diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h
index cfe20002d8..3f6d0af8db 100644
--- a/xen/include/xen/shutdown.h
+++ b/xen/include/xen/shutdown.h
@@ -6,7 +6,7 @@ extern int opt_noreboot;
 
 void dom0_shutdown(u8 reason);
 
-void machine_restart(char *cmd);
+void machine_restart(void);
 void machine_halt(void);
 void machine_power_off(void);